Various formatting fixes - #101
Merged
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Note
Medium Risk
Changes core whitespace/comment emission and import-group layout, which can alter formatted output broadly; risk is mitigated by large idempotent snapshot tests but not zero for edge-case sources.
Overview
Refactors formatter internals so whitespace and comments are modeled as
Gapvalues instead of aTriviawrapper, and widens severalpub(crate)APIs (Layout,Doc,TokenStream, planning types, etc.) for reuse. Shared helpers move ontoTokenStream(matching_brace) andtoken_stream(significant_tokens);Gapgainsdangling(),ends_line(), and trivia splitting returns plain gaps (including capping trailing newlines when only inline comments remain).Emitting now routes through
gap_doc/Separator::afterso trailing line comments and multiline gaps don’t swallow blank lines between top-level items, fixes inline comment spacing when a gap ends without a following newline, and reworks nestedimport { … }layout (opening trivia, separators between paths, trailing commas when comments sit before commas, closing-brace line handling).Adds broad regression coverage for comments (EOF, CRLF, postfix/conditional branches), import sorting/comment ownership, and mixed syntax shapes in a new
regressionstest module.Reviewed by Cursor Bugbot for commit 5077773. Bugbot is set up for automated code reviews on this repo. Configure here.